Use <config.h>.

[HAVE_TERMIOS_H]: Declare ospeed as speed_t.
[USG]: Include <string.h>.

diff --git a/src/terminfo.c b/src/terminfo.c
index 8ce87960f03e109f3b5cf3e701f4d8b3fc7b1d01..eef648b21578b20b56c3746f8e31606ba1ab3473 100644 (file)
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -22,8 +22,19 @@ Boston, MA 02111-1307, USA.  */
    so that we do not need to conditionalize the places in Emacs
    that set them.  */
 
+#include <config.h>
+
+#ifdef USG
+# include <string.h>
+#endif
+
 char *UP, *BC, PC;
-short ospeed;
+#ifdef HAVE_TERMIOS_H
+# include <termios.h>
+  speed_t ospeed;
+#else
+  short ospeed;
+#endif
 
 static buffer[512];